Fix build on Catalina, HTML doc formatting improvements (#759)

* PDF maker: format screen and input same. Shrink padding slightly.

diff --git a/xmldoc/babelpdf.xsl b/xmldoc/babelpdf.xsl
index 1036c6c56cc900df482665c67a10cde306344cfc..4d7125bd522b379c5723cb651e270b122497513c 100644 (file)
--- a/xmldoc/babelpdf.xsl
+++ b/xmldoc/babelpdf.xsl
@@ -15,8 +15,15 @@
 <!-- This template formats userinput as a block-level element and adds the
      background and border we use in the HTML doc, for consistency.  RLP -->
 <xsl:template match="userinput">
-  <fo:block background-color="#E5E9EB" padding="6pt" 
-               border="1pt dashed #000000">
+  <fo:block background-color="#E5E9EB" padding="4pt"
+               break-after="auto" border="1pt dashed #000000">
+    <xsl:call-template name="inline.boldmonoseq"/>
+  </fo:block>
+</xsl:template>
+<!-- Sometimes we use userinput and sometimes screen. Format both. -->
+<xsl:template match="screen">
+  <fo:block background-color="#e5E9EB" padding="4pt"
+               break-after="auto" border="1pt dashed #000000">
     <xsl:call-template name="inline.boldmonoseq"/>
   </fo:block>
 </xsl:template>
@@ -52,7 +59,7 @@
     <xsl:attribute name="table-layout">fixed</xsl:attribute>
     <xsl:attribute name="width">
       <xsl:value-of select="$table.width"/>
-    </xsl:attribute>    
+    </xsl:attribute>
     <xsl:call-template name="simplelist.table.columns">
       <xsl:with-param name="cols">
         <xsl:choose>